add cworth remote, revert broken waffle.

A merge to waffle breaks piglit.  This branch drops that revision.