Revert 7618c5a..e9b7865

This rolls back to commit 7618c5a1ef09bbd48a0346913d2b1a3049071642.