Revert 3613c3b..388a803

This rolls back to commit 3613c3bd8f813157d0c929d7a8491692edfe2c76.