Revert "Update 1.6 compatibility issues"

This reverts commit bbfa0193127c82076f4989801279cfd6a1cac32b.