Revert "Merge pull request #3 from nallagsoc/1.12"

This reverts commit 5f1978701a34d3da232b92df9bd5bd17f168b615, reversing
changes made to 6288396e79a55d329692c04c7842044b5d5137f8.
Merge branch '1.12'
Merge remote-tracking branch 'upstream/master'