This reverts commit 5c74bef194 and commit 10e421a105. See gh-283
5c74bef194
10e421a105
See gh-283
Closes gh-124