Revert "Merged branches"

This reverts commit e0ed6da504fc1bb490e82b95e3478e5a114b1aeb, reversing
changes made to 0c09d2718afc2aa49e18e530d07a955a39e04769.