Revert PR #3359 as this is breaking stuff for many folks. Need to rethink how we handle system defaults differently on this
Refactor similar functions into common sections
Silence take function and use unaliased commands