Revert change from 2013-05-06 (SHA-1: 10c54a7eca144a094d6607d5572d8d8a4e506b28) now that single-lock promotion is handled properly.
Minor code simplification.