Revert 1.6.0

This rolls back to commit 1.5.9