Revert "Merge commit 'e481035e9783c71edd6e814f29e73ce3092f2bff' into UI"

This reverts commit d8d594ba5b99e6d1788a0aab34fa741a7a0a0439, reversing
changes made to cc21a802954341a2e8404f36625708b6c5d4597f.