I personally write, and have seen many others use as well, the "two-storey" a and g, so I suspect there's regional variation.