remove if/else with duplicate code

[sjunges]

There was no diff between the aux and non-aux code here.