Revert 6f764ea..a6601c7

This rolls back to commit 6f764eaa9170438a55b8a6098f8c47f6910910bc.