OHAI-501 / OHAI-502: Switch to using shell_out.