Revert "Merge branch '7.0-JS-59' into '7.0-stage'"

Merged Ignacio Goitea requested to merge REM-JS-59 into 7.0-stage

This reverts commit a2059df4, reversing changes made to dc9a9531.

Closes JS-59

Merge request reports