Removed use of is_overridden; didn't work quite as expected.