Revert e1f4823..4745de1

This rolls back to commit e1f4823084bae5579cc2b5678d6bdc3bc2cc8a8d.