[galaxy-commits] commit/galaxy-central: kanwei: Cleaner fix for 5828:e34b1108f7f8