the original deallocation mechanism is not exposing any problems, I am reverting back to it. Signed-off-by: Jiri Kosina