Squashed #335

A squashed version of #335.