one more hack made redundant by commit 44fa7d0. yay!