This reverts commit ad20e93ba0ee622b4ad5ca9aaef12696499687b7, reversing changes made to df3e9b1b20.
df3e9b1b20