This reverts commit 7ed2476eea.
This was supposed to be committed to the linux-syscall-support
project. The two CLs landing at the sametime confused me.
Note: LSS has been updated via commit 08056836f2b4a5747daff75435d10d6.
Review URL: https://codereview.chromium.org/1395743002 .