Reverting this to rev 1.3. It's apparently broken everywhere at rev

1.6, and pierslauder didn't respond to email about it on Monday.