#38 This code isn't needed now since the problem is fixed elsewhere