Revert "Merge remote-tracking branch 'jans/master' into jan"

This reverts commit e6daa868d4d0654909967bc9a4e3448a2ca23383, reversing
changes made to 791d5640eaaea471cb5f50713721158b4b7a539a.
Reset everything to Jan's repo.