Comment 1 for bug 535528

Jay, I assigned this to you as you've been playing around with that code recently and may be able to resolve it a bit quicker than me... although I'm happy to take it if wanted (but will be a little while before I get to it).