Revert r351078, r351085: stand/quad.h eviction
It did not go well; further examination is required...