Actually, I wonder if this is a "hack" that is no longer needed with these changes...?

-[Unknown]