This reverts commit e62e923b. We force the recompilation in this PR already. So keep the code base simpler.
