Merge "Remove our wait4 hack."