Restore 2

This rolls back to commit 2afe4d73adea82c5c05cb5ace2c90c651245e091.