Yet another attempt to get stuff working again.