Workaround script for old 3.5 upgrade bug