Revert f680ac7..c5c4d91

This rolls back to commit f680ac7fde3b3f85abe91b05f0765acf197f83c1.