Revert "Ashwin/Melanie | #000 | fixing ft."

This reverts commit 5d39cc0aa87d0653f5a9ed126c2391b2fa50f23f.
Ashwin/Melanie |#0000| fixing ft