Revert 7f1c41c..459c3bd

This rolls back to commit 7f1c41c6d38d3236c9efcc09cae5c5c76906534c.
Ui changes done