revert 6c1dfc9; ref #2525 #2565