Putting back deleted changes to format.h