Revert bug introduced in 9a2162e