A shorter version of 858b59e