Revert "Revert "Revert 5461821..41fd52b""

This reverts commit faa8fa770844a63444531e300d02c4139861d3df.