Removing duplicate code now that fixes are available in wonder master.