I've been sitting on this uncomitted changed for a while, likely needed for BinkIt outbox support (oops).