Reverting back to Art's version