Revert b1f525c..8592c47

This rolls back to commit b1f525caba726da824ce0d487a82d84952337628.