Now that !3453 (merged) is merged removes a small hack that worked around the previous build limitation.