Has this update been punted to be done in a separate PR?