Revert 5740b37..01956c4

This rolls back to commit 5740b3784e9c420cf1b39b8ba80b40617af44116.