Revert "Already Defined"

This reverts commit 256d31225dde56cc469942bc5fbefa724d9040b4.