I was hesitant to change that because of unexpected behavior changes elsewhere