Fixes #5216
Merge pull request #5219 from GrahamCampbell/4.2-confirm2

Fixes My Derp