Implements MOTM-528, removes a forgotten comment