dd747d7bcb
This reverts commit dfafdbdfc3. There's no
author, and also problems with it. I'll redo it.
Sponsored by: Netflix