update:
add missing portion of agrabren's jellybean patch