Revert d627402..fa5f91a

This rolls back to commit d6274024c5511f6e134aed5468baa1cfc73f14a1.