Revert d8b2b46..209fe33

This rolls back to commit d8b2b46091f92e98c35eeedfec301dffc5e70257.