is the stuff other than this if block strictly needed for this change?