Revert c052987..fbc1925

This rolls back to commit c052987df7efe487361e173bc73bd1a6e8ba65bc.