Reverts the changes from 75fe50e and a27d670 since they don't follow the 13392:2004.