revert #11510, moved to 2.6