New -x code had some problems, so restore the old code for now.