Revert e765136..ef9060a

This rolls back to commit e76513671adb5a8100762980b1c33f02a3ef6197.