Revert esk-prefixed functions until I have time to port starter-kit-defuns