Bring back old manifest with fixes