WIP: See if this makes Travis happy.