Add intentional API changes (second try, fix cut+paste problem)