Revert e59143a..abde8ee

This rolls back to commit e59143a9e5d3a74640b1970bde519202301a7a26.