reverting undesired change in is_supported from previous commit