This reverts commit 25d8428c and adds normal enabled/disable indicators. POST is all weird today, but so far this looks good. (cherry picked from commit bbe9e070) (cherry picked from commit 177010dd)
