Revert #59 (4a31f302 and b86664ef)