This reverts commit 97675013, reversing changes made to 1ae4a549. Changes are no longer needed since the error this fixed has been turned into a warning.