Revert "Simply "prepare system" by removing options"

This reverts commit 64ca12876701f9105c84d432d7db2e421cf48cf1.
Revert the changelog too