Revert e0a1b29..5f5dd2d

This rolls back to commit e0a1b2963490c13399cdf44e1790d148dbd9151f.