Reverted commit D3557832