Reverts 7f51eb6c and 382ee822.
Merge request pipeline #150716 passed
Merge request pipeline passed for 76641b40 3 years ago
Pipeline #150728 passed
Pipeline passed for 76641b40 on master 3 years ago