Backed out changeset 98f0e9eadf3b (better fix on the way)