For 6.x

Good luck!