Unmajor such and such

This reverts commit 38f5d796bb7f9a49ad42df738da8e8eb800e704a.