Back out this change

It doesn't work at the moment. I'll resubmit when I've tested it properly now
that I have a working VM again.