Reverted commit 0619e0b893