Ack. I actually removed this code in a different pull request (that already made it through)