Revert "Another fix"

This reverts commit 0e1c26d5aac14491cbf815c3ff0aa9c23ae8ade8.