This reverts commit d120a385.
The change introduced unwanted side-effects which would only get worse with time.