Another update to restore pre 3.5.5 functionality, this should be the last