Revert some experimental changes