Reverted broken change