Lazy implementation of dropped support