Is this FIXME going to be addressed in the future or in this PR?