Reverting r223548 which broke running in the shell on OS X.