This reverts commit e5894aba42. Breaks macOS/iOS build. Reverting per chat with Josh; he'll fix later today.
e5894aba42