Partially undo yesterday's wcs changes

Fixes #12