Revert "Merge pull request #5486 from nlutsenko/master"

This reverts commit 51da0f7c40eecf356e6946c192167ab9dbdebc74, reversing
changes made to c584960981740245fcf96f6694f2b2c8d14a31ee.

I mistakenly believed that this was passing on Travis. :sadface: