Better mavericks fix without the timer. Need to investigate why that
timer doesn't seem to work reliably.