reverted prepare changes which broke database copying