Removed workaround for Make generator