Revert 7f9b6ef8f786be69ebe69285427598f4c06e57f4.

But only a part of it.