Update for latest Piston (I guess???  It was working a minute ago...)