Revert "Merge branch 'Test-branch'"

This reverts commit 91a42e80754c51a7185ad5b966c81c7bd27b37ec, reversing
changes made to 4a13df6502ed45a443b84c01a2c2076c28e8fcf0.