Rolled back undocumented changes to printing functions introduced in 2.5.0.

Rolled back undocumented changes to printing functions introduced in 2.5.0. #1176