build 10->12 (reverted from commit 3cc17509ca72cc9488c14475fc80cf47368a3d70)