Wondering if we should still leave this one out.

Want to avoid any hidden bugs this might introduce, especially for a nexus.