Revert 037d749..06acc0c

This rolls back to commit 037d74948c5881077c40892d314610fcfb382db0.