Removed last FIXME after manually verifying all calls to the method.