Revert e8c9875..b902619

This rolls back to commit e8c98755cfea8fd90a9ae342f1b8db816e9662a2.