Move work-around to appropriate file.