Revert a0a565ff - changes need to go through styling review

[merge]