Reverted default commands for consistency with upstream