Revert 245a336..e2da4ab

This rolls back to commit 245a33646e2a68336efce0e4551eef39beff36da.