Revert e2c5b25..b250fbf

This rolls back to commit e2c5b2529d8c78ed524c4eb7656461bcbbce89c6.