Brought redesigned code closer to pre-redesign code.