Revert "Migrated for placement for 1.7.10 source code"

This reverts commit c019f103980076fdfb2b8f16f01ef1ca3fd16293.