These are available as temporaries.
Gavin, do you have a patch for this? Or do you think we should work on this? If so, could you describe the task here?
Sorry Zoltan, this was a just a silly little fix I was quickly landing, forgot to close the bug. Fixed in r84462.