Remove FIXME comment since it's not longer relevant