Revert "Make the build a bit faster"

This reverts commit e3874afb7e1ad0582cfdc44ab71e9fdc69161b0c.