Revert 2f2d37c..4b20f68

This rolls back to commit 2f2d37c9da9de7e709bac4015bc37c2913936e39.