Revert "tiny bug"

This reverts commit 10b2da031be06646fe2d16dbfb22842af8291190.
Revert "Removed extraneous code"

This reverts commit 5f96ccae686bd0e344976926f63a3505bb296791.