Cherry picks gone dreadfully wrong...followed by manual commits gone dreadfully wrong.