Revert "Merge branch 'background'"

This reverts commit 7ed59aca281c8576bd85a9bc242f6b8b9bcdbb94, reversing
changes made to 10fcce11e20a44b249997b5720c40bc40823ec46.