Revert stuff Max pushed directly by accident.

This reverts commit 42baed492b92769b469e1b3c470183990fe78b16.