Backing out some presumably debug shortcuts :)