simplify slightly
Merge commit '456f189bb275ba3efbe655b38396e86b7e0ee481' into test