bootstrap etc
Revert "bootstrap etc"

This reverts commit 45d18777d673a02ba4975c26d62d8d8fc293b085.