I have removed the fallback "overkill" behavior (not only from this file but also from other modules).