Backed out changeset cb9cc74d782c

This fix... it was a non-fix.