Revert 4213ab4..f7d669d

This rolls back to commit 4213ab48913916004b982a5ad231648d1fcd79a8.