Revert "Working on fixing auto-fill"

This reverts commit 5b6f454118cc244b727c3dd67d277d32be70d1ae.