Revert "Merge remote-tracking branch 'obvious/master' into spec"

This reverts commit 5507ff68ddd005fc1a8f34a05826cff633692969, reversing
changes made to e93b6b28d55a4b405e530f8f9a17155d6091b28b.