Uncommited code before 1.6 update
Revert "Uncommited code before 1.6 update"

This reverts commit 558907b11b6db4d261f1001cb152b56e62c1ec5e.