Reverted commit D3427621