Revert c1c6eaf..a3b794b

This rolls back to commit c1c6eaff90f24c72326fc7ddc7aff6685626974d.