Another FIXME bites the dust :^) (cherry picked from commit 9c4e80a3eca8329e5fd9e9fe75eac816b5666069)