Revert "stylebranch changes"

This reverts commit 246ad0c6d0a4212447d7d71cad986d339804919c.