This reverts commit 70303b9363, reversing changes made to 7a9d2545c4.
70303b9363
7a9d2545c4
Reviewed-on: #165