Bug 7607: (follow-up) Disable rather than remove inputs