update:
applied a missing portion of agrabren's jellybean patch