Revert hack for bug#1086910, other origin/enterprise tests are affected

[merge]