Revert "removed version locks for testing"

This reverts commit 44aff6c2c38f47844047a6c1b4d1fc1174d6458c.