Make Environment replacement note less kludgy Upstream-commit: 030df722797295826838d63df5caff5c73746428 Component: engine