Backout patch that shouldn't have been landed.