This reverts commit d12c25c2
merged
By Adrien van den Bossche on 2020-06-19T13:55:51 (imported from GitLab)
mentioned in commit c4897d6c