Revert 3a11564..6c1a2b4

This rolls back to commit 3a115648f75c95067bc95492be9997df2192fe40.