Revert r224433, r224371 is good enough for now.