This is causing problems since we don't get the key also. See LP #1265850