Revert r30136, 30137 (bug 12681) -- new location of message bar interferes with lock...