Revert 4182e6b..a5eb17a

This rolls back to commit 4182e6b3038b0cd60579e0f67c2ccd6dfc995b60.