Temporarily revert complex watch as it affects the runtime VM when called in succession