Committed from Mac
Revert "Committed from Mac"

This reverts commit 7e4f3923fa45da896a7b815e90f2ec451d505caa.
Revert "Revert "Committed from Mac""

This reverts commit 6329d55de128e01bfbd9585a784af62d8f165be6.