Revert "Merge branch 'master-working-2'"

This reverts commit fecf4853579c0c19f4cdffc12e86ee2c44abdc4b, reversing
changes made to b0a265442ba77a40a426a0d7e6e054d22d76b375.
Revert "Merge branch 'master-working-2'"

This reverts commit b0a265442ba77a40a426a0d7e6e054d22d76b375, reversing
changes made to 1ca1b2dd041c49d50b71c69b31c3b5d550617788.