Fallback to system properties for backwards compatibility

Signed-off-by: Marcel Soute <m.soute@gmail.com>