Manually reverting #10