Revert "Merge branch 'bug1'"

This reverts commit 2b1ddd91c0347cfd9501c337799ee107cd782fd9, reversing
changes made to cc1c617110c4b61a8689e4b2dae113b188eca73d.