Revert 0fba85d..cd22585

This rolls back to commit 0fba85d26b4d3967d0ab95f3edb0f0564fb4f5d8.