Revert b5da7ec..d36f22a

This rolls back to commit b5da7ec60626b1ad3fef906fe55611c9539e757a.