Revert D110488985: Remove Touchable (base) from public API