Revert "Update for 1.5.1"

This reverts commit e2dddb23eca3a2f6de139278bd983b1ad04007ce.