Revert 45d5a25..44dff3b

This rolls back to commit 45d5a25f801f872c8e89360828c30b762292913e.