Revert "MDL-33105 flexible apply_units() function"