Revert "Revert "Revert "stylebranch changes"""

This reverts commit 804731713b47ed41dace93daadd73945d64bd734.