Fix: 3.5 migration that was not complete. Second chance into 3.6.