Reverted some changes -- still debugging fan action.