Revert "Merge branch 'master' into spider1"

This reverts commit d01a6c386bf9ee7dcbc01c60fb52e10b23d7570e, reversing
changes made to 283b8894aea56549621abab73b56c125d51dea26.