Revert "lcobucci PR"

This reverts commit 1aaebae28c8b0e70af95ac9d8f2fa5dbbbf00a27.