Follow-up to dbadaeb which changed the style.
dbadaeb
This change necessary for binary compatibility. Prior to this change test 1135 failed due to the order of functions.