Revert "DO NOT MERGE THIS COMMIT."

This reverts commit 6e7be682683c050170b687c1f87e644bee73433c.