Reverting #4309 at this caused TypeError: object is not a function
Merge pull request #4321 from mfojtik/revert_4309

Merged by openshift-bot