Revert "Removing unneeded fix in last commit."

This reverts commit 37ea2e2a545af6e312986638480998ef7d848d61.