Pull request id singletons/crowbar/crowbar/1680 closed upstream.