This reverts commit 25d8428c and adds normal enabled/disable indicators. POST is all weird today, but so far this looks good.
