Revert the branch
Merge topic 'revert/update-style-guidelines' into next

c0c75e87 Revert the branch