Reverting a little hack that got checked in.