Revert "update for 3.5"

This reverts commit 1a6e6d460ca7a00e96a1bd986edba5f0ed34b4c6.