Move the workaround to loadscpt.cpp as per feedback comments.