Revert 7e3678c..7931332

This rolls back to commit 7e3678ce2d33907d16b37eeb1b21236fe1291a5b.