reverses incorrect logic introduced by r243200