Revert "Add FIXME"

This reverts commit a4afcd533fce7d577a9aae75bf8351e87009b126.

Code removed in 7fabff5ffac497ea8a8245a22af446c66c19531f
Merge pull request #2427 from fredj/misc

Revert "Add FIXME"