Revert e53ef7f..b1ec53d

This rolls back to commit e53ef7fa213e4809cd2814b4aad1077bc5f09c86.