Revert "Merge pull request #1527 from tglman/hotfix-1.4.1"

This reverts commit 92d2db873a75a41773f58c106cebeb67f908650b, reversing
changes made to 04fc345710e113cfd3ca8f7cd58f2e0e5cbda23a.