Revert "more preparation"

This reverts commit a0a6cd82c66b31ed98ec113fbcf1308869f445bf.