Reverting 1.8.7 compatability