Very not elegant patch. Please explain why is this needed and we'll think about something.