Revert 7c6c3f8..309d3a2

This rolls back to commit 7c6c3f8c7e3fee93e3afa5171e6745d1104cf8c1.