Ported fix to bootstrap code.
Fixed frameBorder issue caused by previous patches.