[TASK] Revert partial implementation of extension selection