Found the right place to hook in. Removed this change.