Revert some changes to make things display better.