Revert 6262f5a..faee9f6

This rolls back to commit 6262f5a65b7a51fc36d1517331c8319de8089b3e.