Revert 7fed5b2..f7010c4

This rolls back to commit 7fed5b25cb1a6c333cfe61073ce337ba53a8abc2.