Revert b6f3c93..cc0cbae

This rolls back to commit b6f3c9376c783fe6be36f8be1b1d499c86514c28.