I'm assuming there are no tests that actually support the functionality being removed? Otherwise this change would break those tests...