Revert #3358
Merge pull request #3360 from tractorcow/pulls/3.1/revert-3358

Revert #3358