[master] Make code compatible with master again