Reverted to upstream and added local config instead