Fixes andrewplummer/Sugar#654
Coverage remained the same at 96.617% when pulling 76c3d0f67d9206b81340ff25f7c19b1aa0386d76 on jikamens:Sugar654 into 4adba2e6ef8c8734a693af3141461dec6d674d50 on andrewplummer:master.