Revert ade87b9..78420aa

This rolls back to commit ade87b9e8f02d807fcd582050abe1699e75d7d9f.