Revert "Style changing issue"

This reverts commit 35300054d16bd5c3e0d43484ed70e31479b6e761.
Revert "Revert "Style changing issue""

This reverts commit f5f8d908765efb8a5f1b507b004c412332a874ce.