Fix some of the scale back logic to account for the changes to self._converted
Fix some of the scale back logic to account for the changes to self._converted

pllim/astropy,larrybradley/astropy,joergdietrich/astropy,saimn/astropy,stargaser/astropy,AustereCuriosity/astropy,mhvk/astropy,saimn/astropy,funbaker/astropy,lpsinger/astropy,bsipocz/astropy,mhvk/astropy,DougBurke/astropy,pllim/astropy,AustereCuriosity/astropy,stargaser/astropy,DougBurke/astropy,lpsinger/astropy,aleksandr-bakanov/astropy,DougBurke/astropy,AustereCuriosity/astropy,kelle/astropy,pllim/astropy,dhomeier/astropy,astropy/astropy,funbaker/astropy,stargaser/astropy,StuartLittlefair/astropy,dhomeier/astropy,dhomeier/astropy,dhomeier/astropy,bsipocz/astropy,MSeifert04/astropy,StuartLittlefair/astropy,MSeifert04/astropy,kelle/astropy,pllim/astropy,larrybradley/astropy,larrybradley/astropy,joergdietrich/astropy,tbabej/astropy,astropy/astropy,kelle/astropy,dhomeier/astropy,lpsinger/astropy,tbabej/astropy,kelle/astropy,bsipocz/astropy,aleksandr-bakanov/astropy,funbaker/astropy,AustereCuriosity/astropy,astropy/astropy,saimn/astropy,larrybradley/astropy,AustereCuriosity/astropy,aleksandr-bakanov/astropy,astropy/astropy,lpsinger/astropy,StuartLittlefair/astropy,joergdietrich/astropy,bsipocz/astropy,mhvk/astropy,MSeifert04/astropy,stargaser/astropy,funbaker/astropy,mhvk/astropy,kelle/astropy,joergdietrich/astropy,tbabej/astropy,saimn/astropy,joergdietrich/astropy,aleksandr-bakanov/astropy,MSeifert04/astropy,saimn/astropy,DougBurke/astropy,mhvk/astropy,larrybradley/astropy,tbabej/astropy,StuartLittlefair/astropy,pllim/astropy,StuartLittlefair/astropy,lpsinger/astropy,tbabej/astropy,astropy/astropy