Reverted from commit f0b96e88bc31c0a48f336f7029832ba8b6bd2678