Derp fix for the recent reverts. Proper fix will be on its way.

Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>