Revert "Followup to d897aa5; fix crash on Mac"

This reverts commit 9837f430b313eceeee246f966fc60115df3ee722.