This reverts commit 627d8bcaef, reversing changes made to 66d4462724. The change breaks build on mac
627d8bcaef
66d4462724