Revert r107066, see CR comments for full rationale. Basically this moves the previewe...