issue #23165: make the optimized version the only one