reverted prepare changes which broke database copying
reverted prepare changes which broke database copying