Making temporary workaround for 'Use billing address as shipping' checkbox not working