Merge "Replace our broken wcswcs with the working upstream one."