#972 revert layout update