Ripping out the hack and making things work a little better.