Revert #74 for testing