@BrettMeyer, please don't auto-close this bug which has a working patch because of an over-strict test case policy!