[TASK] Remove override code whose fixes have been merged to core