Revert syscalls back-port from 4.10