Return to master version (for separate fork)