Revert "Merge branch 'athena-my21.2-2019-03-06' into '21.2'" (!21705) · Merge requests · atlas / athena · GitLab

Nils Erik Krumnack requested to merge revert-a6afaf7a into 21.2 Mar 07, 2019

This reverts merge request !21691 (merged)

That one broke stuff, so let's revert it.