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

This reverts commit 6a5cc5dcd7cbfe3672ca10d4815e0cdc692b859a.

This backout is breaking travis.  Relanding for now