Re-add a copy of v4.1.15