Revert 7057617..c43b852

This rolls back to commit 7057617c60c4a112aa2d439d750c658532ff7dcb.