Revert "Fix failing Mac test for previous commit" This reverts commit 070e30e6daba74fe62ea486dc97cd01a79f90541.