Remove crappy first attempt.