Revert 7914874..8764722

This rolls back to commit 79148747878a5a6c3ca0099ace8cd3e5f709863f.