revert commit 36c0005b61384e9fac3da994ba7992f61841f0b5
Merge branch 'master' into numeric