Revert "patch fixes from last commit"

This reverts commit 0e8c8c027695aa4d04649692f43c8179fd9fdb85.
Revert " Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/…"

This reverts commit 6dfda3120797937fdf10ffd3092cc0cca1b77bd0.