Revert "Merge branch 'update'"

This reverts commit 0d7d654a439f2705585874e0d7d053d5e60d8b38, reversing
changes made to 22d7129cf066df01d0ad4218afac49cd16f65541.