Revert "Merge pull request #374 from alulaq2/R3-UI-D1-Rebase"

This reverts commit d4c587398a69cf0ca1bd6a3cc753c3b4e90e2b7c, reversing
changes made to 51dc616aaf335de0d232ccfd2b5b403dd605940d.