[BUGFIX] Switch ViewHelper restored for safe deprecation