Revert bdcc753..a689678

This rolls back to commit bdcc7539bf91c72bae5ef7be6c11fd03ef1b179b.