repro'ing changes made by @sethmanheim in the AUX39 branch