Removed some extraneous and erroneous code from the boot delegation code. I think it was added accidentally when refactoring it. (FELIX-1721)