Attached is a patch which implements this functionality.
 -Zachary Kanfer