repro'ing changes made by @sethmanheim in the AUX39 branch
Merge pull request #1553 from mollybostic/master_0904

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