reverting (for now) due to Newline issue in 3.3