Revert "Revert a31ff6b..34ec21a"

This reverts commit e459b8e57971d4ac2ad1c9de4836181164a1231f.