Revert cca3825..c1f3768

This rolls back to commit cca3825574a71e17f04a2ac20fbc436bb6767c4e.