MDL-28155 mod_assignment - Fix an ugly hack