Revert e97e541..8391a49

This rolls back to commit e97e541d01bb484a8d3153b0f3cc2717246408ac.