Revert 6e70189..0787585

This rolls back to commit 6e70189b51dff21bfbc0c1f5ed01fcc30366aba6.