Fix backpatching error in commit 55c88079