Revert "Update from master"

This reverts commit 12fbcc39dc33e8c9c8e5ed7f535a2e6655bba34f.