Reverted support/unsupport changes (question)