Revert 727b461..7ecb5f5

This rolls back to commit 727b461502d47c58839ce5e6ad9a6eb92ed02aed.