This reverts commit acb7669c.

the wrappers are not needed anymore.

Signed-off-by: Ingo Molnar <mingo@elte.hu>