Revert "Workaround an assertion failure during module build"

This reverts commit e77e14ec.

According to @rsmith on https://reviews.llvm.org/D131858, he believes
the reason for this workaround in the firstplace has been fixed.
Reverting the workaround to hopefully confirm that is the case.