Revert "Revert "home fix""

This reverts commit 60b3c0e83be9676f302ef6ada086926546688019.