Properly fix it now, not just a temporary bandaid fix for a release.