Revert April Fools commit

This reverts commit 646791d25713ac1c6c749c3cf29b3d3c0c4e1b2e.