Revert "Merge branch 'master' of https://github.com/mailmindlin/teach-oop"

This reverts commit a053584005ec2c345192dc66551040fb0e35c9a2, reversing
changes made to 195156a639459faf60a51bce6d2043a668955184.