Reverted some changes to loader which added extra complexity in exchange for negligible benefits.