Moved legacy code (after 028.0 release) in separate 'if' statement.