Revert "Pull #24"

This reverts commit ec61b0452064c126c73075826266e60fdb24d332.