Per the ALOY-362 note above, make sure this changes here too