Revert "Commit #18"

This reverts commit 942658bdb30b9f3b1295e1bacdcad83734632654.