Backed out previous commit that introduced a bug