Andy, should we be removing the read_only check in this case? It was already here...