Revert style option deprecations.

This reverts commit 008cd3df195fec192c16075d319e15a0483274a1.
This reverts commit c10d855c9ff14256a21966cb0ab91e0e5056fb94.
This reverts commit 2d8fe773c022a634fa7ef8bc0b8a7003d2fa8b95.
This reverts commit b462142eb0e2da0a7afe6fe99d9e640acd74d7e8.
This reverts commit c95a57a49cd9345d37622cd0a004c2ddaea159f7.
This reverts commit 5f60a86529ea11c006c8b1ff903a4eb40bfb65f1.
This reverts commit 56f8a4784b257e08c0fa8e2f66c49dabb122313f.
This reverts commit b1571ea577ae4e7d0aa14ca396726d39cc03aad8.
This reverts commit 364f81d8dbb005467537e79763ab572d1d63f1fa.