Revert "Please let this let us merge, please?"

This reverts commit 2b20ba21711281d9e1658e74d841a98891cfce23.