Fixing commiting outdated backported code