* WIP * Fix overlay prefix not preserving correctly * Work around failing REPL tests * Remove wrong code when removing with --keep-custom