This makes the workaround behave prior to merging astropy/astropy#2691.