Revert "EZP-20933: attempt to make Travis happy"

This reverts commit 9796ec4e363cd3557ec9e77fa71e03d85b9ef9d7.
Revert "EZP-20933: added regression test"

This reverts commit 18485a13bd75ae37370dabb3d923d4ad402e51c7.