Merge "Switch back to mksh as the default"