Revert "fix for 4.7"

This reverts commit ed6f414ce677e4b4cb9569ce7e59480be434dd08.