Completed #42
Revert "Completed #42"

This reverts commit 3cce6b2c9777b377af73d83c42d4b98678edbd14.