Revert "DO NOT COMMIT"

This reverts commit 76679c1f91fc68134c850b2d77ff2b83b32a108f.