Finishing the removal of scoped from style blocks started in pr#1577