This reverts commit 339593ca90. Fixes null pointer dereference. Signed-off-by: Marton Balint <cus@passwd.hu>
339593ca90