revert r23048 for now until Darwin compile issues have been sorted out (#7934)