remove no-longer-needed special case handling in popen