revert 40eaf705 for performance reason; ref #2022