Revert 2c99f3b..693b7a0

This rolls back to commit 2c99f3bf21e0a9038c9ff1689749505ae2044c2c.
Revert "1.6"

This reverts commit 2c99f3bf21e0a9038c9ff1689749505ae2044c2c.