Committed in r5906. Let me know if it causes any problems for y'all.