Revert test bootstrap loader