Backed out changeset 72a2eec4204a (incomplete fix)