Revert a138d12..3442744

This rolls back to commit a138d1242716e7fb81c98216d8c060897d3181d8.