Revert previous commit to have faster build

This reverts commit 6516646e2f0b558ef81f8be705ae0c1764c0eb17.