That patch doesn't apply cleanly to master