Revert ed2d965..cd1c5f9

This rolls back to commit ed2d965a867766833a2d8aac26e45498e2d0c699.