Revert some commit to ready for new recent ui.