This reverts commit ce9894c8bf. I don't immediately see what has gone wrong, so reverting for now.
ce9894c8bf