Undid also some changes on the scheme loading code that are not necessary anymore.