Revert 6fa1ddf..cea7458

This rolls back to commit 6fa1ddf1b23441528aa22e1b65d54c36f7b78f67.