Include change that was accidentally excluded from 538b17d8c6a6be9360045d9d88922fd793b524bd