revert for 2.6?