Fix wrong revert. (Not ready for 3.x need to investigate.)