[cvs-nhc98] patch applied (yhc): Removed incorrect fix of Core.Play, worked around in CorePrep