Revert 1f9f1e8..0907256

This rolls back to commit 1f9f1e88502240e26cc2cf8a02d7b4b01a131d23.