Scope creep error

See a8d6189 for more details concerning the "why?" for this patch.