Temporary revert until metadata fix is applied.