Revert be230de..3f491d3

This rolls back to commit be230de67c7f3c2882d312986ffeff25f302a9b2.