revert Click on Expander header support (reverted from commit d56c0e5f5052118acc01ae8f2fe7154b82900170)