This reverts commit 199563534a2fc38f72fa93c4fdd03221afe06996. f29cfab55d1fd80 was reverted in c6c54132b76.