Moistly's two-up work.
Revert the unnecessary changes.