Yay ripping out code can be painful!