Revert "Merge branch 'master' into Ning_instruction"

This reverts commit ea53c42ee6ec798196d75d5dd0e5e301d88a16c9, reversing
changes made to 3191d41bbefb02cb22468a6732974b8fd1f375ce.