Issue LOOP-72 by tj: Replaced patch. Revoked branch