revert changes, I will change it on master branch and bring it over.
Copied new formatting from master.