Revert "Fix regression introduced in 7b39c38" This reverts commit 7d89f659ffa45d381c3c4ee03c55f74635042829.
2017-01-22T11:23:24