Reverted r84386; breakage too severe