note that this patch includes a hack to revert to the 'Default' state correctly
(cherry picked from commit 1d4f6a974f9b04873ba9ef5f016053364ef62836)