#9703 restore original version