Revert "Address a UI issue. DO NOT MERGE." This reverts commit 9d9846ef5eeaf71ea67c76cebddea94b9b1ea392