Revert #10. Test was right. Actually fixed #10 now.