Revert 3e8b9bd..dcaec56

This rolls back to commit 3e8b9bd25f5b37a443b533b64d5dfde2c3d2e0d8.