Revert "Merge branch 'master' into static"

This reverts commit 79d1528996be908d950a745688fd7c37485a0015, reversing
changes made to 2a8ddbed38c8d183bed7e1a907996e672583f9cb.