I'll squash this change in and resubmit