Revert "changes made to work with 1.1.5"

This reverts commit 065a6bb0f0369867ad3fd4103092186adfcadf03.