Revert d69d3c9..bd48e36

This rolls back to commit d69d3c9e8c50a6a954bbbc68539e542c49499b94.
DID WE FIX IT?