The logic here was incorrect. Original tests still pass.