Revert "Deleting for now to avoid infinite loop"

This reverts commit 9502b6c38fa0a00c0efa9730166ad5e4034d780e.