Revert 73fe5c6..f64c22c

This rolls back to commit 73fe5c675a2db951b302bfd68524bf7a56094d46.