Commit 0927ecf1c62e944e67f648da1e6e6ceee2b82e0f

William Pitcock 2017-01-22T23:29:59

Revert "Actually fix the regression introduced in 7b39c38" This reverts commit 5e5c418837b569196cc17eb999b3c11a9cc0099d.