Revert "merge"

This reverts commit 55b551f957b4c376368a6c28686533fef4a74aa3.

Conflicts:

	runtime/concurrent_cilk_internal.h