Re-added compatibility to Frodo