Revert manifest version to 2, closes item:417