This reverts commit f8d7f2f4, reversing changes made to a7378eac.
There seems to be some infinite loop during the build caused by this change, so we must investigate it.