Revert 6832729..69b1bc2

This rolls back to commit 6832729e2290fa8573f103115f873efc8d225812.