Cleaning up after accidental commit by Stian.