Revert "Updated for 1.6.2"

This reverts commit 8d09c73a22efa48e0d516c49f66037717293a057.