Revert "Merge remote-tracking branch 'origin/master' into Benni"

This reverts commit c81a04dabe9dbec2f311100898175b0bae3348de, reversing
changes made to 5b7bd0b46e1c60cba452f096d86881202e3bd809.