This is in the default implementation of sync_step now