Revert 5eda86a..d3ca8ec

This rolls back to commit 5eda86a82845aa808e54606eeff58b5872c35f6a.