Ack.

I've removed this change for now, will submit later.