Disable following the definition for now, until all the issues with it are fixes