Revert "1.5 update"

This reverts commit 2fe2caf79bd639c39f6227baa25e9bb2ca339654.