The other half of commit a36c7db :-/