Revert "PopupDataEntry"

This reverts commit d4b643f1400e58e5a81ac5178e485f85eab84ec8.