Solve the FIXME set in r99025.