Revert re-ordering of functions as that will clash with #17