Revert "Commit from Mac"

This reverts commit ead24ca116c7cd1b1e42292ef532287a0af81dbb.
Revert "Revert "Commit from Mac""

This reverts commit 7250a6e8040bb533f87cea57c83044523c812c47.
Revert "Revert "Revert "Commit from Mac"""

This reverts commit ea3c5f8cbbbd546d01143b9eefca320103d674c4.