Removing some 'magic' which didn't really work.