Revert eb3c9a3..1a1bd69

This rolls back to commit eb3c9a36d074517edf2a36094ce71a271de88db0.