Revert 1e2aea8..8514cb7

This rolls back to commit 1e2aea8a8d9df8392ce8d4e55ccc80441b9f1481.