#2539 removed dangerous and unmaintainable code

2018-01-29, Edouard Tisserant