Reverting since "controller_lock" will be set to "no" by default. This reverts commit 6e337de3780870ef024348425cca611f3981c8ac.