Revert "Fix for the previous commit."

This reverts commit d18ca4cb1f2572d711ae4868f4d8b6052e74857b.
Revert "Revert "Fix for the previous commit.""

This reverts commit ab2bf7f285b6555b4f96d91195d221b7481d1777.