[galaxy-dev] [hg] galaxy 1597: Backed out changeset 36a297157114