This reverts commit ee7ad83f20. There was no consensus on reverting 3eb93c07f7, so doing that will have to wait until the discussion ends.
ee7ad83f20
3eb93c07f7