Revert 7707fa8..685dadd

This rolls back to commit 7707fa82574dfd6b72fb01f59abe348f6190ee80.