Revert "1.6.1 patch."

This reverts commit c31dee681647dda818eecbaf628e16c0340a414d.