LPS-30322 Undo some source formtting for performance and threadsafty purposes.