Removed a FIXME (this code actually does what the FIXME requested now).