Revert "[BUGFIX] Serialize expression in switch viewhelper"