Revert "Merge remote-tracking branch 'origin/tide_edit'"

This reverts commit e1897481da9656a3eae66e90ee1366978188554e, reversing
changes made to 528ab490265f76f7d43b3ba6e58323ef891f4e45.