Revert e1ede0c..a713f09

This rolls back to commit e1ede0c3515a6bbd907ed3233ef19f29e195ef84.