Revert b80fb9e..02f64bd

This rolls back to commit b80fb9ebce6bd79145b50c8a5d48c33efb171906.