This reverts commit d3ebd428650748e60db70dd2171cc044855814b1. This caused a build failure on multiple targets.