reverted some re-formating to keep the diff clean