Revert "BeforeDataSource at home"

This reverts commit a2bcf468198ca980d22918934ca186ce5f7c8955.
After dataSource