Revert 2e0965a..8d789e0

This rolls back to commit 2e0965a66cf115bb5326045d3b6d27009bf49011.