Revert c6990b2..4e44d40

This rolls back to commit c6990b23016b69c86da4d4f7a074fe3ad7ce9627.