Revert "Accessiblity fixes"

This reverts commit 9c467071bcfacbdf5aa3ff9fac673fc111e4edcb.