Revert "Forward port AM/PM Style Settings"

This reverts commit 59b412c8031f6d5c2b6415465c1512f92284f2db.