Pipe painter bad-fix revert

Oops. Thanks Segrain.