Revert 523c490..9570511

This rolls back to commit 523c490cb6beff8e6fcc2b17e92e53a979d62f2b.