Revert a5b59a4..1e376f6

This rolls back to commit a5b59a4f214780fc38376b06cbfe62f8978f8073.