Revert to de22caa2c395cc93dcd14e2beb03c9c270218260
Reintroduced changes dropped during reset, hopefully properly merged now.
[KFSQA-744] re-merge from master after yesterday's fix on master