Revert to 4e5cd0a47e0317020a2447be14d66c7e7943a45d