Revert some changes to get back compatibility