Since recent changes cause issues when building with features Signed-off-by: Lee Smet <lee.smet@hotmail.com>