Revert b9fc7da..240b4d5

This rolls back to commit b9fc7daf0e50e8e21d13709d706c49f84a5249bc.