Latest (revert on subfolder mode still broken).