This partially reverts commit e1173c87 until we find out why libcxx tests are failing under runtimes build.