Revert r271378 -- I will approach this differently upstream