Revert 191e31b..7b72de1

This rolls back to commit 191e31b59b42eea58832a44bf30ebe479ead6c22.