should have been part of commit d2db8cf