Revert cc5dc7c..c41058d

This rolls back to commit cc5dc7c5eb7d5f09959f52f7d5092d901bcf736a.
Revert "Revert cc5dc7c..c41058d"

This reverts commit 07c28045c5719252d8381d6c8f79faafe6cef186.