This fixes the previous commit to master. (imported from commit 43637dcf0832a4e91de9fd98ebb777c77a3eee19)