From 5594c0e22e2195886e57db5979cad3be268c8b1d Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Mon, 3 Apr 2017 15:08:21 -0400
Subject: [PATCH] Revert "Fixes #1292: composer merge + composer patches not
 playing nicely. (#1294)"

This reverts commit 10109d41626346fbfc95b8c55aa76c7d3064568e.