Revert "Merge branch 'p1' into 'master'"

This reverts merge request !46
12 jobs for revert-9d6d567a in 3 minutes and 51 seconds (queued for 6 seconds)