Switch to no-frame version