Revert 277be4b..c1e9709

This rolls back to commit 277be4baf5718e29f72fc2db929f0e36fbf181cd.