Followup to r54406: enable/disable functions were being called in the wrong order...