Revert "All newer commits squished into one."
.. This will be done properly in newer commits.

This reverts commit 3d6a4ca00caadcd90aab4662fc23d02a43920790.