Revert unintentional merge from wip/surface-content to wayland

This reverts a lot of commits.