Revert "last fix was incorrect"

This reverts commit ba465aa1691d6155fa9d6b3c6fe60a069491bf54.