Reverting removal of NullOutputStream for backwards compatibility