Revert d28be2b..2eb79b2

This rolls back to commit d28be2b9a8723c2e49217581a41e2c54b9c402cc.