This reverts commit dec80fb0. (cherry picked from commit b01329bf)
mentioned in merge request !551 (merged)