Revert #41 for now