As far as I understand it, this is now obsolete as ```master``` now does it correctly, right?