Revert "Closes #287"

This reverts commit 991c4203ef3bdf8a1d197f2fe877028dc78dfda7.
Closes #287
Merge branch '2.0'