#2565 Removed dangerous optimization
revamp
2018-02-06, Edouard Tisserant