Revert ddd3aa0..d996d79

This rolls back to commit ddd3aa04d6cde578cd82ea3c15b170cb1706ae5d.