Revert 0d41a44..74fc8be

This rolls back to commit 0d41a44336bfcd44d4b8d60e0c07632fa1a6a799.