revert previous standalone change