The last stragglers for #101 should be fixed in tomorrow's community bundle; if so, remove the workaround.
