Commenting out broken functionality for the release