Revert 3e3a809..ec82798

This rolls back to commit 3e3a80967ef371b579ea6d7bb83bbebaf691b074.