This patch needs to be rebased—the code you're changing has already been corrected.