Partially reverting the previous fix, doing it right this time.