Changed faulty merge back to something actually runnable.