Revert commit 0f5bb7704b31 which was apparently due to a bug in a Yosemite beta