Back out hacks which worked around xlat ATTRIBUTE returning NULL