Revert "Revert "Revert "Merge pull request #13276 from gasolin/issue-919927"""

Triple revert action!
This reverts commit 231840cb0ba4520e003b3f28d47476d9ebfe544b.

Please do not land this until I determine what's breaking on travis.