Revert 6c00d0b..b7281af

This rolls back to commit 6c00d0bf653bb4f17d94ddeb266690c483b89fc5.