Revert 2f77b05..85f7785

This rolls back to commit 2f77b05fc8a46bb2be6fa348408e781a232f5656.