chore(mustach): revert incorect watch/observ optimization