Issue 973441 2

oops, put return in wrong method... it will be moved to panel.js