Revert 3a2a5a3..320dfa1

This rolls back to commit 3a2a5a3367030f88578921a0e9d92f385ec1bf2a.