Merge "Remove the hacks needed to support ash and mksh concurrently."