Revert 117ecdf..0c8dd52

This rolls back to commit 117ecdf0faa25f274da0d5f0fe587b429346e2a4.
Rolled Back