Revert "Merge in this file from master"

This reverts commit 096e319322ce452e06bd71cc2b2dacf06c4df304.