Revert 67fe099..843b877

This rolls back to commit 67fe0992c0384570b6053c0e9b8fd3370f11c63c.