Revert helper until emberjs#2474 fixed and worked around